From: Chong Yidong <cyd@stupidchicken.com>
Date: Fri, 17 Jul 2009 01:32:50 +0000 (+0000)
Subject: Fix last change.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~11436
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=821fc54a6dff8999094d155590ee31d6740d3abd;p=emacs.git

Fix last change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index d3b2ed805d9..ff8742f8be5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2009-07-17  Kenichi Handa  <handa@m17n.org>
 
 	* casetab.c (shuffle): Fix the logic of setting up the cycle.